-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Copy bin/*
and lib/*.dylib
files to stage0-sysroot
#107956
Conversation
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon. Please see the contribution instructions for more information. |
r? @jyn514 |
I don't have time for reviews right now. r? @ozkanonur |
PR can't be passed in the pipelines currently. Please make sure all the pipelines gets passed successfully then we can review the changes. |
@ozkanonur I've fixed the breaking changes. Do I add a new commit or ammend it to the existing one? |
Ammend it please :) |
@rustbot ready |
ref from the issue:
Still doesn't work remotes/KittyBorgX/master $ ./x dist --stage 0
thread 'main' panicked at 'could not read dir "/home/nimda/devspace/personal/rust2/build/x86_64-unknown-linux-gnu/stage0-sysroot/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends": Os { code: 2, kind: NotFound, message: "No such file or directory" }', lib.rs:1522:25
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace config: # Includes one of the default files in src/bootstrap/defaults
profile = "compiler"
changelog-seen = 2
[build]
# patch-binaries-for-nix = true
# extended = true
#cargo-native-static = false
# sanitizers = false
[rust]
deny-warnings = false
download-rustc = false Also, Here is the output of running cargo with using ~/devspace/stuff/hello stable $ cargo +issue-101691 run
error: process didn't exit successfully: `rustc -vV` (exit status: 127)
--- stderr
/home/nimda/.rustup/toolchains/issue-101691/bin/rustc: error while loading shared libraries: librustc_driver-c78d16bcb49dc5d0.so: cannot open shared object file: No such file or directory |
I see the issue. The original pr (#101711) broke when As to
and didn't copy it. I will work on the same and update this pr. |
This doesn't work on ~ $ rustc +issue-101691 --v
/home/nimda/.rustup/toolchains/issue-101691/bin/rustc: error while loading shared libraries: librustc_driver-c78d16bcb49dc5d0.so: cannot open shared object file: No such file or directory
Please take your time |
@ozkanonur Can you help me? I've found a fix which works and passes the tests but I pulled the upstream changes and git(hub) added a commit. Is there any way I can delete the commit? Or should I close this PR and open a new one? |
git reset --hard d8d95b5c0dbfea63b37a390252c5023fd7041bc8
git push --force This will remove the diffs and commit you mentioned. If you want to merge these 2 commits, do soft reset instead. |
d8d95b5
to
982ab4d
Compare
Thank you so much! I've made the necessary changes and pushed it. |
@ozkanonur and @jyn514 Tysm for helping me throught the PR! I couldn't have done it without your help :D |
congrats and thank you for your first contribution :) |
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#107592 (Default `repr(C)` enums to `c_int` size) - rust-lang#107956 (Copy `bin/*` and `lib/*.dylib` files to `stage0-sysroot`) - rust-lang#108126 (fix a line, and do a consistency fix) - rust-lang#108144 (Add compiler-errors to a few more triagebot groups) - rust-lang#108149 (typo) - rust-lang#108154 (`BasicBlock::new(0)` -> `START_BLOCK` [no functional changes]) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
@rust-timer build 89394208c043edd910fa6c950968ca75fcf349c0 |
This comment has been minimized.
This comment has been minimized.
Finished benchmarking commit (89394208c043edd910fa6c950968ca75fcf349c0): comparison URL. Overall result: no relevant changes - no action neededBenchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf. @bors rollup=never Warning ⚠: The following benchmark(s) failed to build:
Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
|
@KittyBorgX ^ |
ah alright. |
It's the same thing AFAIK, bootstrap timings = building rustc. The timings there are from a previous run, the "B column" is missing. |
…crum Copy stage0 `rustc` binaries to `stage0-sysroot` This is basically a revival of rust-lang#101711 and rust-lang#107956, with an added check that the full sysroot will only be created if the original rustc comes from `stage0/bin`. What is/should be tested: - [x] `rustup toolchain link stage0` (new libstd is used correctly) - [x] `python3 x.py fmt dist --stage 0` - [x] Custom rustc/cargo in `config.toml` (in this case this logic is ignored) - [x] Perfbot (try perf run has succeeded) - [x] Real use case (rust-lang/backtrace-rs#542) (Hopefully) fixes: rust-lang#101691 This is not the "end all, be all" solution to this problem, but as long as it resolves the basic use-case, and doesn't break perfbot, I say ship it. This code will probably be nuked anyway Soon™ because of the stage redesign.
Copy stage0 `rustc` binaries to `stage0-sysroot` This is basically a revival of rust-lang/rust#101711 and rust-lang/rust#107956, with an added check that the full sysroot will only be created if the original rustc comes from `stage0/bin`. What is/should be tested: - [x] `rustup toolchain link stage0` (new libstd is used correctly) - [x] `python3 x.py fmt dist --stage 0` - [x] Custom rustc/cargo in `config.toml` (in this case this logic is ignored) - [x] Perfbot (try perf run has succeeded) - [x] Real use case (rust-lang/backtrace-rs#542) (Hopefully) fixes: rust-lang/rust#101691 This is not the "end all, be all" solution to this problem, but as long as it resolves the basic use-case, and doesn't break perfbot, I say ship it. This code will probably be nuked anyway Soon™ because of the stage redesign.
Fixes #101691